merge the imagemagick branch to trunk
authorJoakim <joakim@localhost.localdomain>
Thu, 19 Aug 2010 07:35:40 +0000 (09:35 +0200)
committerJoakim <joakim@localhost.localdomain>
Thu, 19 Aug 2010 07:35:40 +0000 (09:35 +0200)
commitf1199a25afe8d009137b7e7084254504b91cff54
tree2d10f02ee1efdfd01d7c420c701b43c5b34ee5c0
parentae0f9f4e60fd94aeb637f7e5b4a3c6759cf853b6
parentd1ee12099263360ce5cebee86ecbcdeb060a6861
merge the imagemagick branch to trunk